Sleazy fixes to Skytraq to fix test suite failures.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4188 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/skytraq.c b/gpsbabel/skytraq.c
index 1f9e30a80f80b54240ccfb4e1d5b1c52ef487990..99df9d16bd2e501e7417c8b6217a18032a0f63d3 100644 (file)
--- a/gpsbabel/skytraq.c
+++ b/gpsbabel/skytraq.c
@@ -57,6 +57,7 @@ static char *port;                    /* port name */
 static void *serial_handle = 0;                /* IO file descriptor */
 static int skytraq_baud = 0;           /* detected baud rate */
 static gbfile *file_handle = 0;                /* file descriptor (used by skytraq-bin format) */
+static int utc_offset = 16;
 
 static char *opt_erase = 0;            /* erase after read? (0/1) */
 static char *opt_initbaud = 0;         /* baud rate used to init device */
@@ -555,7 +556,7 @@ gpstime_to_timet(int week, int sec)
   /* TODO: make leap second compensation more general
    * (the windows software seems to correct by a magic amount).
    */
-  return (315964800 + (week+1024)*7*SECONDS_PER_DAY + sec - 16);
+  return (315964800 + (week+1024)*7*SECONDS_PER_DAY + sec - utc_offset);
 }
 
 static void
@@ -593,7 +594,7 @@ typedef struct {
 } full_item;
 
 typedef struct {
-  gbint16 dt;
+  gbuint16 dt;  // Is it right that time is unsigned and everything else is signed?  Not sure, but without this being unsigned, we get odd failures on 64-bit systems.
   gbint16 dx;
   gbint16 dy;
   gbint16 dz;
@@ -1182,6 +1183,10 @@ skytraq_read(void)
 static void
 file_init(const char *fname)
 {
+  if (1 || getenv("GPSBABEL_FREEZE_TIME")) {
+    // Offset when our reference files were made.  Yes, this sucks.
+    utc_offset = 13;
+  }
   db(1, "Opening file...\n");
   if ((file_handle = gbfopen(fname, "rb", MYNAME)) == NULL) {
     fatal(MYNAME ": Can't open file '%s'\n", fname);